auto merge of #319 : alexcrichton/cargo/fix-staticlibs, r=wycats
authorbors <bors@rust-lang.org>
Wed, 6 Aug 2014 18:49:48 +0000 (18:49 +0000)
committerbors <bors@rust-lang.org>
Wed, 6 Aug 2014 18:49:48 +0000 (18:49 +0000)
The file-naming bits weren't handling the staticlib case


Trivial merge